Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix 1.1 e2e's to work with 1.2 clusters with scheduler named "default-scheduler" #20740

Merged
merged 1 commit into from
Feb 9, 2016
Merged

Fix 1.1 e2e's to work with 1.2 clusters with scheduler named "default-scheduler" #20740

merged 1 commit into from
Feb 9, 2016

Conversation

ikehz
Copy link
Contributor

@ikehz ikehz commented Feb 5, 2016

Fixes #19724.

Includes a partial cherry-pick of #19608.

@k8s-github-robot k8s-github-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Feb 5, 2016
@k8s-github-robot
Copy link

Labelling this PR as size/M

@k8s-bot
Copy link

k8s-bot commented Feb 5, 2016

GCE e2e build/test failed for commit a7f287cc3ee4dc6b6b9c1fb3dbb7c8034274611f.

@@ -100,13 +109,20 @@ func verifyResult(c *client.Client, podName string, ns string, oldNotRunning int
expectNoError(err)
_, notRunningPods := getPodsNumbers(allPods)

// See comment at top of scheduler_predicates.go
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

repeating this three times... maybe this should be a util func?

@ikehz
Copy link
Contributor Author

ikehz commented Feb 5, 2016

@ixdy PTAL.

// It changed the default scheduler name from "scheduler" to
// "default-scheduler", breaking forward-compatibility with tests that rely on
// finding events from the default scheduler.
var multiSchedulerVersion = version.MustParse("v1.2.0-alpha.6")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

const?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can't assign a const a function call.

@ixdy
Copy link
Member

ixdy commented Feb 5, 2016

needs gofmt, otherwise LG

@k8s-bot
Copy link

k8s-bot commented Feb 6, 2016

GCE e2e test build/test passed for commit 0a36a05e16d4d54078b9e56165e6217f500b4659.

@ikehz
Copy link
Contributor Author

ikehz commented Feb 8, 2016

@ixdy gofmt done; PTAL.

@k8s-bot
Copy link

k8s-bot commented Feb 8, 2016

GCE e2e test build/test passed for commit 0511f52.

@ixdy
Copy link
Member

ixdy commented Feb 9, 2016

LGTM

@ixdy ixdy added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 9, 2016
@k8s-github-robot
Copy link

@k8s-bot test this [submit-queue is verifying that this PR is safe to merge]

@k8s-bot
Copy link

k8s-bot commented Feb 9, 2016

GCE e2e test build/test passed for commit 0511f52.

@k8s-github-robot
Copy link

Automatic merge from submit-queue

k8s-github-robot pushed a commit that referenced this pull request Feb 9, 2016
@k8s-github-robot k8s-github-robot merged commit 80453ab into kubernetes:release-1.1 Feb 9, 2016
shyamjvs pushed a commit to shyamjvs/kubernetes that referenced this pull request Dec 1, 2016
…-release-1.1

Auto commit by PR queue bot
shouhong pushed a commit to shouhong/kubernetes that referenced this pull request Feb 14, 2017
…-release-1.1

Auto commit by PR queue bot
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/test area/upgrade lgtm "Looks good to me", indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants